Use a MinGW that doesn't break pthreads

Also correct the bits to triples mapping, because tyops

diff --git a/appveyor.yml b/appveyor.yml
index 7c9839c2f9cb519e83d6b0f72ff1948b90f94a08..3017466e488206455a8ef0ab74946bcaae4db8d1 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,13 +11,19 @@ environment:
     ARCH: amd64
   - TARGET: x86_64-pc-windows-gnu
     ARCH: amd64
-    BITS: 32
+    BITS: 64
   - TARGET: i686-pc-windows-gnu
     ARCH: x86
-    BITS: 64
+    BITS: 32
+    MINGW_ARCHIVE: i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z
+    MINGW_URL: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.2/threads-win32/dwarf/i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z/download
+    MINGW_DIR: mingw32
 
 install:
   - IF "%MSVC%"=="" set PATH=C:\msys64\mingw%BITS%\bin;C:\msys64\usr\bin;%PATH%
+  - if defined MINGW_ARCHIVE appveyor DownloadFile "%MINGW_URL%" -FileName "%MINGW_ARCHIVE%"
+  - if defined MINGW_ARCHIVE 7z x -y "%MINGW_ARCHIVE%" > nul
+  - if defined MINGW_ARCHIVE set PATH=%CD%\%MINGW_DIR%\bin;C:\msys64\usr\bin;%PATH%
   - python src/etc/install-deps.py
   - python src/etc/dl-snapshot.py %TARGET%
   - SET PATH=%PATH%;%cd%/rustc/bin